From: Emmanuele Bassi <ebassi@gnome.org>
Date: Fri, 1 Nov 2019 15:22:02 +0000 (+0000)
Subject: ci: Add diffutils to the CI image
X-Git-Tag: archive/raspbian/4.4.1+ds1-2+rpi1~1^2~321^2^2~665^2~1
X-Git-Url: https://dgit.raspbian.org/%22http://www.example.com/cgi/%22/%22http:/www.example.com/cgi/%22?a=commitdiff_plain;h=a5c00685c541ad907a40fb7cdc6457c57fcb7d08;p=gtk4.git

ci: Add diffutils to the CI image

Some transitive dependency got dropped, and we lost diff.
---

diff --git a/.gitlab-ci/Dockerfile b/.gitlab-ci/Dockerfile
index 22553c36e8..391f1af9c7 100644
--- a/.gitlab-ci/Dockerfile
+++ b/.gitlab-ci/Dockerfile
@@ -1,7 +1,6 @@
 FROM fedora:31
 
 RUN dnf -y install \
-    hicolor-icon-theme \
     adwaita-icon-theme \
     atk-devel \
     at-spi2-atk-devel \
@@ -14,6 +13,7 @@ RUN dnf -y install \
     dbus-daemon \
     dejavu-sans-mono-fonts \
     desktop-file-utils \
+    diffutils \
     elfutils-libelf-devel \
     fribidi-devel \
     gcc \
@@ -32,6 +32,7 @@ RUN dnf -y install \
     gstreamer1-plugins-bad-free-devel \
     gstreamer1-plugins-base-devel \
     gtk-doc \
+    hicolor-icon-theme \
     iso-codes \
     itstool \
     json-glib-devel \
diff --git a/.gitlab-ci/run-docker.sh b/.gitlab-ci/run-docker.sh
index b0857777ee..4892769c88 100755
--- a/.gitlab-ci/run-docker.sh
+++ b/.gitlab-ci/run-docker.sh
@@ -2,7 +2,7 @@
 
 set -e
 
-TAG="registry.gitlab.gnome.org/gnome/gtk/master:v6"
+TAG="registry.gitlab.gnome.org/gnome/gtk/master:v7"
 
 sudo docker build --build-arg HOST_USER_ID="$UID" --tag "${TAG}" \
     --file "Dockerfile" .